<div id="block-<?php print $block->module.'-'.$block->delta; ?>" class="clear-block block block-<?php print $block->module; ?>">

<?php if (!empty($block->subject)): ?>
  <h2><?php print $block->subject; ?></h2>
<?php endif;?>

  <div class="content"><?php print $block->content; ?></div>
  
<?php
  if ($block->module == 'block'):
    if (user_access('administer blocks')):
?>
    <div class="block-tabs-wrapper">
          <span class="blockeditlink"><?php print l('[Edit this block]', 'admin/build/block/configure/'.$block->module.'/'.$block->delta, array('query' => drupal_get_destination())); ?></span>
    </div>
<?php
    endif;
  endif;
?>
  
</div>